Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: add sync-beta-upstream #459

Merged
merged 2 commits into from
Jun 25, 2024
Merged

ci: add sync-beta-upstream #459

merged 2 commits into from
Jun 25, 2024

Conversation

shmpwk
Copy link
Collaborator

@shmpwk shmpwk commented Jun 20, 2024

Description

This workflow is intended for the use in the repositories created by forking tier4/autoware_launch.
It means this PR does not work in tier4/autoware_launch.

  • A beta branch in forking repository synchronizes with a beta branch in tier4/autoware_launch.
    • We need to set base-branch: beta/<version> and sync-target-branch: beta/<version> such as base-branch: beta/v3.0.0 and sync-target-branch: beta/v0.29.0 in each product.
  • Triggerd every 5 a.m.

Backgound

Currently, in our product release test, we only develop our own product such as xx1.
But those commits should be given back to the vanilla pilot-auto and should be shared with the other products.
Here, we propose to create rule: In product development, commit vanilla pilot-auto first and then syncronize with each product.
We need to develop sync CI to syncronize our product with pilot-auto and autoware_launch. This PR is the one for it.

Related links

INTERNAL_LINK

Tests performed

We have a similar CI: https://github.com/tier4/autoware_launch/blob/tier4/main/.github/workflows/sync-tier4-upstream.yaml
It is commonly used and I believe it can replace our test.

Notes for reviewers

Effects on system behavior

  • For each product, please change base-branch: beta/<version> and sync-target-branch: beta/<version> such as base-branch: beta/v3.0.0 and sync-target-branch: beta/v0.29.0.
  • We need to manually change the version everytime the new product release starts.

Pre-review checklist for the PR author

The PR author must check the checkboxes below when creating the PR.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

  • The PR follows the pull request guidelines.
  • The PR has been properly tested.
  • The PR has been reviewed by the code owners.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

  • There are no open discussions or they are tracked via tickets.
  • The PR is ready for merge.

After all checkboxes are checked, anyone who has write access can merge the PR.

Signed-off-by: Shumpei Wakabayashi <[email protected]>
@shmpwk shmpwk changed the title ci: add ci: add sync-beta-upstream Jun 20, 2024
@shmpwk shmpwk merged commit ac6cc16 into tier4/main Jun 25, 2024
18 checks passed
@shmpwk shmpwk deleted the ci/sync-beta branch June 25, 2024 00:46
@dkoldaev
Copy link

Thank you for the PR! Can you explain with an example of what is the proposed process and how the PR will work in it. As I understood, all products will be forked from vanilla and will be getting updates from vanilla. But the addition is that all products will also be giving back their updates to the vanilla version. Is my understanding of your idea correct?

@shmpwk
Copy link
Collaborator Author

shmpwk commented Jun 25, 2024

@dkoldaev
Thank you for your comment, and yes it is as I said in the slack.

各リファレンスデザインは、tier4/autoware_launch からsyncした変更をtier4/autoware_launch.* に入れる。
パラメタの変更はtier4/autoware_launch.* に入れる
パラメタ以外の変更はtier4/autoware_launch に入れてから、tier4/autoware_launch.*にsyncする。

shmpwk added a commit that referenced this pull request Jun 25, 2024
* ci: add sync-beta-upstream

Signed-off-by: Shumpei Wakabayashi <[email protected]>

* style(pre-commit): autofix

---------

Signed-off-by: Shumpei Wakabayashi <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
yuki-takagi-66 pushed a commit that referenced this pull request Aug 1, 2024
* ci: add sync-beta-upstream (#459)

* ci: add sync-beta-upstream

Signed-off-by: Shumpei Wakabayashi <[email protected]>

* style(pre-commit): autofix

---------

Signed-off-by: Shumpei Wakabayashi <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* fix for v3.1.0

Signed-off-by: Shumpei Wakabayashi <[email protected]>

---------

Signed-off-by: Shumpei Wakabayashi <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants